Tegra: remove duplicate code from CPU's power on path

This patch removes duplicate code from the CPU's power on path. The removed
code is already present as part of PSCI's power on logic.

Change-Id: I4d18a605b219570c6bf997b9e6be6e7853ebf5cd
Signed-off-by: Varun Wadekar <[email protected]>

diff --git a/plat/nvidia/tegra/common/aarch64/tegra_helpers.S b/plat/nvidia/tegra/common/aarch64/tegra_helpers.S
index 4bf1a9df406120335d5ddac134e2b2bd1e087d8c..3575f6860c7285e257d62d176cc208e1e8acf124 100644 (file)
--- a/plat/nvidia/tegra/common/aarch64/tegra_helpers.S
+++ b/plat/nvidia/tegra/common/aarch64/tegra_helpers.S
@@ -414,31 +414,6 @@ restore_oslock:
        mov     x0, #1
        msr     oslar_el1, x0
 
-       cpu_init_common
-
-       /* ---------------------------------------------------------------------
-        * The initial state of the Architectural feature trap register
-        * (CPTR_EL3) is unknown and it must be set to a known state. All
-        * feature traps are disabled. Some bits in this register are marked as
-        * Reserved and should not be modified.
-        *
-        * CPTR_EL3.TCPAC: This causes a direct access to the CPACR_EL1 from EL1
-        *  or the CPTR_EL2 from EL2 to trap to EL3 unless it is trapped at EL2.
-        * CPTR_EL3.TTA: This causes access to the Trace functionality to trap
-        *  to EL3 when executed from EL0, EL1, EL2, or EL3. If system register
-        *  access to trace functionality is not supported, this bit is RES0.
-        * CPTR_EL3.TFP: This causes instructions that access the registers
-        *  associated with Floating Point and Advanced SIMD execution to trap
-        *  to EL3 when executed from any exception level, unless trapped to EL1
-        *  or EL2.
-        * ---------------------------------------------------------------------
-        */
-       mrs     x1, cptr_el3
-       bic     w1, w1, #TCPAC_BIT
-       bic     w1, w1, #TTA_BIT
-       bic     w1, w1, #TFP_BIT
-       msr     cptr_el3, x1
-
        /* --------------------------------------------------
         * Get secure world's entry point and jump to it
         * --------------------------------------------------